From 7a8ca05bfd238413d16cc452b5d011069bcf9802 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 4 Nov 2005 20:31:15 +0000
Subject: [PATCH] Don't rely on GNU C-ism of (null) output.

---
 gpsbabel/reference/cet/cet-sample.cp1250.txt  | 32 +++++++++----------
 gpsbabel/reference/cet/cet-sample.latin1.txt  | 32 +++++++++----------
 gpsbabel/reference/cet/cet-sample.latin2.txt  | 32 +++++++++----------
 .../reference/cet/cet-sample.macroman.txt     | 32 +++++++++----------
 gpsbabel/tmpro.c                              |  2 +-
 5 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/gpsbabel/reference/cet/cet-sample.cp1250.txt b/gpsbabel/reference/cet/cet-sample.cp1250.txt
index 0a59e0bc0..1645bac37 100644
--- a/gpsbabel/reference/cet/cet-sample.cp1250.txt
+++ b/gpsbabel/reference/cet/cet-sample.cp1250.txt
@@ -1,17 +1,17 @@
 Group	sID	sDescription	fLat	fLong	fEasting	fNorthing	fAlt	iColour	iSymbol	sHyperLink
-new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	(null)
-new	0x9E	ž - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	(null)
-new	CS	Ovládací Prohlížení lokální síte	50.514406	13.638634			-99999999.00	255	1	(null)
-new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	(null)
-new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	(null)
-new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	(null)
-new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	(null)
-new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	(null)
-new	HR	Pregledavanje lokalne mreže	50.477937	12.510391			-99999999.00	255	1	(null)
-new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	(null)
-new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	(null)
-new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	(null)
-new	X1	žðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
-new	X2	žðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
+new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	
+new	0x9E	ž - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	
+new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	
+new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	
+new	CS	Ovládací Prohlížení lokální síte	50.514406	13.638634			-99999999.00	255	1	
+new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	
+new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	
+new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	
+new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	
+new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	
+new	HR	Pregledavanje lokalne mreže	50.477937	12.510391			-99999999.00	255	1	
+new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	
+new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	
+new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	
+new	X1	žðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
+new	X2	žðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
diff --git a/gpsbabel/reference/cet/cet-sample.latin1.txt b/gpsbabel/reference/cet/cet-sample.latin1.txt
index f7cf4ef30..80efa7d23 100644
--- a/gpsbabel/reference/cet/cet-sample.latin1.txt
+++ b/gpsbabel/reference/cet/cet-sample.latin1.txt
@@ -1,17 +1,17 @@
 Group	sID	sDescription	fLat	fLong	fEasting	fNorthing	fAlt	iColour	iSymbol	sHyperLink
-new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	(null)
-new	0x9E	$ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	(null)
-new	CS	Ovládací Prohlí$ení lokální síte	50.514406	13.638634			-99999999.00	255	1	(null)
-new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	(null)
-new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	(null)
-new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	(null)
-new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	(null)
-new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	(null)
-new	HR	Pregledavanje lokalne mre$e	50.477937	12.510391			-99999999.00	255	1	(null)
-new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	(null)
-new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	(null)
-new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	(null)
-new	X1	$ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
-new	X2	$ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
+new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	
+new	0x9E	$ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	
+new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	
+new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	
+new	CS	Ovládací Prohlí$ení lokální síte	50.514406	13.638634			-99999999.00	255	1	
+new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	
+new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	
+new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	
+new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	
+new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	
+new	HR	Pregledavanje lokalne mre$e	50.477937	12.510391			-99999999.00	255	1	
+new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	
+new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	
+new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	
+new	X1	$ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
+new	X2	$ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
diff --git a/gpsbabel/reference/cet/cet-sample.latin2.txt b/gpsbabel/reference/cet/cet-sample.latin2.txt
index a10be2a1d..0db84c227 100644
--- a/gpsbabel/reference/cet/cet-sample.latin2.txt
+++ b/gpsbabel/reference/cet/cet-sample.latin2.txt
@@ -1,17 +1,17 @@
 Group	sID	sDescription	fLat	fLong	fEasting	fNorthing	fAlt	iColour	iSymbol	sHyperLink
-new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	(null)
-new	0x9E	¾ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	(null)
-new	CS	Ovládací Prohlí¾ení lokální síte	50.514406	13.638634			-99999999.00	255	1	(null)
-new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	(null)
-new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	(null)
-new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	(null)
-new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	(null)
-new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	(null)
-new	HR	Pregledavanje lokalne mre¾e	50.477937	12.510391			-99999999.00	255	1	(null)
-new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	(null)
-new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	(null)
-new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	(null)
-new	X1	¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
-new	X2	¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	(null)
+new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	
+new	0x9E	¾ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	
+new	0xC9	É - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	
+new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	
+new	CS	Ovládací Prohlí¾ení lokální síte	50.514406	13.638634			-99999999.00	255	1	
+new	DA	Tåning netværkssøgning áâãäåæéë	56.011734	9.847870			-99999999.00	255	1	
+new	DE	Himmelmühle äöüÄÖÜß	50.625865	13.060611			-99999999.00	255	1	
+new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	
+new	ES	Matalascañas Navegación Táliga	37.007446	-6.558838			-99999999.00	255	1	
+new	FR	Boissière-École Contrôle  réseau Mâle	48.679047	1.652069			-99999999.00	255	1	
+new	HR	Pregledavanje lokalne mre¾e	50.477937	12.510391			-99999999.00	255	1	
+new	HU	Hõgyész Vezérlõközpont Hálózat	46.491394	18.424072			-99999999.00	255	1	
+new	IS	Borgarfjörður	65.522461	-13.823547			-99999999.00	255	1	
+new	SK	Ovládacie centrum	50.724214	13.524871			-99999999.00	255	1	
+new	X1	¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
+new	X2	¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É×	50.497971	13.027725			-99999999.00	255	1	
diff --git a/gpsbabel/reference/cet/cet-sample.macroman.txt b/gpsbabel/reference/cet/cet-sample.macroman.txt
index 75cfcd7bd..b41688788 100644
--- a/gpsbabel/reference/cet/cet-sample.macroman.txt
+++ b/gpsbabel/reference/cet/cet-sample.macroman.txt
@@ -1,17 +1,17 @@
 Group	sID	sDescription	fLat	fLong	fEasting	fNorthing	fAlt	iColour	iSymbol	sHyperLink
-new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	(null)
-new	0x9E	$ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xC9	ƒ - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	(null)
-new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	(null)
-new	CS	Ovl‡dac’ Prohl’$en’ lok‡ln’ s’te	50.514406	13.638634			-99999999.00	255	1	(null)
-new	DA	TŒning netv¾rkss¿gning ‡‰‹ŠŒ¾Ž‘	56.011734	9.847870			-99999999.00	255	1	(null)
-new	DE	HimmelmŸhle ŠšŸ€…†§	50.625865	13.060611			-99999999.00	255	1	(null)
-new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	(null)
-new	ES	Matalasca–as Navegaci—n T‡liga	37.007446	-6.558838			-99999999.00	255	1	(null)
-new	FR	Boissire-ƒcole Contr™le  rŽseau M‰le	48.679047	1.652069			-99999999.00	255	1	(null)
-new	HR	Pregledavanje lokalne mre$e	50.477937	12.510391			-99999999.00	255	1	(null)
-new	HU	H›gyŽsz VezŽrl›kšzpont H‡l—zat	46.491394	18.424072			-99999999.00	255	1	(null)
-new	IS	Borgarfjšrður	65.522461	-13.823547			-99999999.00	255	1	(null)
-new	SK	Ovl‡dacie centrum	50.724214	13.524871			-99999999.00	255	1	(null)
-new	X1	$ðƒŽËˆéôå‰æë”€Šè‘…š†Ÿ®¾Œ¯¿‚„–²³½ƒ×	50.497971	13.027725			-99999999.00	255	1	(null)
-new	X2	$ðƒŽËˆéôå‰æë”€Šè‘…š†Ÿ®¾Œ¯¿‚„–²³½ƒ×	50.497971	13.027725			-99999999.00	255	1	(null)
+new	01	Hohndorf	50.738297	12.683029			-99999999.00	255	1	
+new	0x9E	$ - latin small letter z with caron	50.497971	13.027725			-99999999.00	255	1	
+new	0xC9	ƒ - latin capital letter e with circumflex	50.497971	13.027725			-99999999.00	255	1	
+new	0xF0	ð - latin small letter eth (icelandic)	50.497971	13.027725			-99999999.00	255	1	
+new	CS	Ovl‡dac’ Prohl’$en’ lok‡ln’ s’te	50.514406	13.638634			-99999999.00	255	1	
+new	DA	TŒning netv¾rkss¿gning ‡‰‹ŠŒ¾Ž‘	56.011734	9.847870			-99999999.00	255	1	
+new	DE	HimmelmŸhle ŠšŸ€…†§	50.625865	13.060611			-99999999.00	255	1	
+new	EO	Trasercado de la loka ret	50.495281	13.027645			-99999999.00	255	1	
+new	ES	Matalasca–as Navegaci—n T‡liga	37.007446	-6.558838			-99999999.00	255	1	
+new	FR	Boissire-ƒcole Contr™le  rŽseau M‰le	48.679047	1.652069			-99999999.00	255	1	
+new	HR	Pregledavanje lokalne mre$e	50.477937	12.510391			-99999999.00	255	1	
+new	HU	H›gyŽsz VezŽrl›kšzpont H‡l—zat	46.491394	18.424072			-99999999.00	255	1	
+new	IS	Borgarfjšrður	65.522461	-13.823547			-99999999.00	255	1	
+new	SK	Ovl‡dacie centrum	50.724214	13.524871			-99999999.00	255	1	
+new	X1	$ðƒŽËˆéôå‰æë”€Šè‘…š†Ÿ®¾Œ¯¿‚„–²³½ƒ×	50.497971	13.027725			-99999999.00	255	1	
+new	X2	$ðƒŽËˆéôå‰æë”€Šè‘…š†Ÿ®¾Œ¯¿‚„–²³½ƒ×	50.497971	13.027725			-99999999.00	255	1	
diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index d1bb33fe7..73c23e738 100644
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -218,7 +218,7 @@ tmpro_waypt_pr(const waypoint * wpt)
 	    wpt->altitude,
 	    colour,
 	    icon,
-	    wpt->url
+	    wpt->url ? wpt->url : ""
 	);
 	    
 
-- 
2.30.2